Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend groovy support #9677

Merged
merged 5 commits into from
Mar 17, 2024
Merged

Extend groovy support #9677

merged 5 commits into from
Mar 17, 2024

Conversation

britter
Copy link
Contributor

@britter britter commented Feb 20, 2024

@britter britter mentioned this pull request Feb 20, 2024
Merged
the-mikedavis
the-mikedavis reviewed Feb 20, 2024
View reviewed changes
runtime/queries/groovy/locals.scm Outdated Show resolved Hide resolved
runtime/queries/groovy/indents.scm Outdated Show resolved Hide resolved
@kirawi kirawi added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-language-support Area: Support for programming/text languages labels Feb 21, 2024
the-mikedavis
the-mikedavis reviewed Feb 27, 2024
View reviewed changes
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The queries look good but you will need to merge master / rebase and resolve the conflict and also run cargo xtask docgen and commit the changes

britter and others added 5 commits February 28, 2024 13:29
@britter
Extend groovy support
9f6f10e 
Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52
@britter @the-mikedavis
Update runtime/queries/groovy/locals.scm
9e76f3f 
Co-authored-by: Michael Davis <[email protected]>
@britter
Drop indent.scm for groovy
e48b49f 
It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.
@britter
Adapt groovy highlights to helix syntax
74c3974
@britter
Update documentation
8ac1e3f
@britter
Copy link
Contributor Author

britter commented Feb 28, 2024

@the-mikedavis sorry for the additional turn around. All should be good now.

the-mikedavis
the-mikedavis approved these changes Feb 28, 2024
View reviewed changes
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@the-mikedavis the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 28, 2024
@britter
Copy link
Contributor Author

britter commented Mar 12, 2024

@the-mikedavis who can we ask for a second review to get this merged?

@britter
Copy link
Contributor Author

britter commented Mar 16, 2024

@archseer do you have some time to check this? I'd really like to get this merged 💚

@britter britter mentioned this pull request Mar 17, 2024
Closed
@pascalkuthe pascalkuthe merged commit f7913c1 into helix-editor:master Mar 17, 2024
6 checks passed
@britter britter deleted the britter/groovy-gradle branch March 18, 2024 19:01
Desdaemon pushed a commit to Desdaemon/helix that referenced this pull request Mar 26, 2024
@britter @the-mikedavis @Desdaemon
Extend groovy support (helix-editor#9677)
7682c8a 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
@britter @the-mikedavis @postsolar
Extend groovy support (helix-editor#9677)
1ac2430 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
@britter @the-mikedavis @postsolar
Extend groovy support (helix-editor#9677)
ef02174 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
@britter @the-mikedavis @postsolar
Extend groovy support (helix-editor#9677)
7513672 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 20, 2024
@britter @the-mikedavis @postsolar
Extend groovy support (helix-editor#9677)
fada58b 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
@britter @the-mikedavis @mtoohey31
Extend groovy support (helix-editor#9677)
34c94c9 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
Vulpesx pushed a commit to Vulpesx/helix that referenced this pull request Jun 7, 2024
@britter @the-mikedavis @Vulpesx
Extend groovy support (helix-editor#9677)
ccca752 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
@britter @the-mikedavis
Extend groovy support (helix-editor#9677)
2bb6b78 
* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
nvim-treesitter/nvim-treesitter@d4dac52

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <[email protected]>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pascalkuthe pascalkuthe pascalkuthe approved these changes

@the-mikedavis the-mikedavis the-mikedavis approved these changes

@archseer archseer Awaiting requested review from archseer

Assignees
No one assigned
Labels
A-language-support Area: Support for programming/text languages S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@britter @the-mikedavis @pascalkuthe @kirawi